Revision: bazaar--devo--1.0--patch-35
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Fri Oct 29 10:23:34 BST 2004
Standard-date: 2004-10-29 09:23:34 GMT
New-files: tests/test-star-merge.sh
Modified-files: libarch/star-merge.c tests/Makefile.in
New-patches: aaron.bentley@utoronto.ca--tla-2004/tlasrc--devel--0.2--patch-24
    jblack@gnuarch.org--2004/tla--devo--1.2--patch-28
    thelove@canonical.com/bazaar--devo--1.0--patch-35
Summary: Fix the star-merge works only one way problem. With test case (Bentley)
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--devel--0.2--patch-24
   Fixed star-merge when MINE has an older revision of REFERENCE

 * jblack@gnuarch.org--2004/tla--devo--1.2--patch-28
   Fixes the star-merge only works one way problem. Came with a test case\! (Bentley)

